<!DOCTYPE html>
<html lang="zh-CN">
<head>
  <meta charset="UTF-8">
<meta name="viewport" content="width=device-width">
<meta name="theme-color" content="#222"><meta name="generator" content="Hexo 7.3.0">

  <link rel="apple-touch-icon" sizes="180x180" href="/images/apple-touch-icon-next.png">
  <link rel="icon" type="image/png" sizes="32x32" href="/images/favicon-32x32.ico">
  <link rel="icon" type="image/png" sizes="16x16" href="/images/favicon-16x16.ico">
  <link rel="mask-icon" href="/images/logo.svg" color="#222">

<link rel="stylesheet" href="/css/main.css">



<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" integrity="sha256-wiz7ZSCn/btzhjKDQBms9Hx4sSeUYsDrTLg7roPstac=" crossorigin="anonymous">
  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.1.1/animate.min.css" integrity="sha256-PR7ttpcvz8qrF57fur/yAx1qXMFJeJFiA6pSzWi0OIE=" crossorigin="anonymous">
  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fancyapps-ui/5.0.28/fancybox/fancybox.css" integrity="sha256-6cQIC71/iBIYXFK+0RHAvwmjwWzkWd+r7v/BX3/vZDc=" crossorigin="anonymous">
  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/pace/1.2.4/themes/green/pace-theme-minimal.css">
  <script src="https://cdnjs.cloudflare.com/ajax/libs/pace/1.2.4/pace.min.js" integrity="sha256-gqd7YTjg/BtfqWSwsJOvndl0Bxc8gFImLEkXQT8+qj0=" crossorigin="anonymous"></script>

<script class="next-config" data-name="main" type="application/json">{"hostname":"sumumm.github.io","root":"/","images":"/images","scheme":"Gemini","darkmode":false,"version":"8.19.2","exturl":false,"sidebar":{"position":"left","display":"post","padding":18,"offset":12},"copycode":{"enable":true,"style":"mac"},"fold":{"enable":true,"height":300},"bookmark":{"enable":false,"color":"#222","save":"auto"},"mediumzoom":false,"lazyload":true,"pangu":false,"comments":{"style":"tabs","active":null,"storage":true,"lazyload":false,"nav":null},"stickytabs":false,"motion":{"enable":true,"async":true,"transition":{"menu_item":"fadeInDown","post_block":"fadeIn","post_header":"fadeInDown","post_body":"fadeInDown","coll_header":"fadeInLeft","sidebar":"fadeInUp"}},"i18n":{"placeholder":"搜索...","empty":"没有找到任何搜索结果：${query}","hits_time":"找到 ${hits} 个搜索结果（用时 ${time} 毫秒）","hits":"找到 ${hits} 个搜索结果"},"path":"/search.xml","localsearch":{"enable":true,"trigger":"auto","top_n_per_article":1,"unescape":false,"preload":false}}</script><script src="/js/config.js"></script>

    <meta name="description" content="本文主要是Git中分支的管理的相关笔记，若笔记中有错误或者不合适的地方，欢迎批评指正😃。">
<meta property="og:type" content="article">
<meta property="og:title" content="LV01-Git-04-Git本地仓库-08-查看差异">
<meta property="og:url" content="https://sumumm.github.io/post/bc162ef0.html">
<meta property="og:site_name" content="苏木">
<meta property="og:description" content="本文主要是Git中分支的管理的相关笔记，若笔记中有错误或者不合适的地方，欢迎批评指正😃。">
<meta property="og:locale" content="zh_CN">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623135309340.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623135354357.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623135957218.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623140104863.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623140729587.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623140830808.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623140940477.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623141450391.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623142939718.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623143202474.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623143250893.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623144957270.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623145122623.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623145222670.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623145314624.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623145410360.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623151447940.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623152110159.png">
<meta property="article:published_time" content="2023-07-02T07:14:28.000Z">
<meta property="article:modified_time" content="2025-06-13T16:25:57.069Z">
<meta property="article:author" content="苏木">
<meta property="article:tag" content="Git">
<meta name="twitter:card" content="summary">
<meta name="twitter:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623135309340.png">


<link rel="canonical" href="https://sumumm.github.io/post/bc162ef0.html">



<script class="next-config" data-name="page" type="application/json">{"sidebar":"","isHome":false,"isPost":true,"lang":"zh-CN","comments":true,"permalink":"https://sumumm.github.io/post/bc162ef0.html","path":"post/bc162ef0.html","title":"LV01-Git-04-Git本地仓库-08-查看差异"}</script>

<script class="next-config" data-name="calendar" type="application/json">""</script>
<title>LV01-Git-04-Git本地仓库-08-查看差异 | 苏木</title>
  








    <script src="/js/browser_tools_disable.js"></script>

  <noscript>
    <link rel="stylesheet" href="/css/noscript.css">
  </noscript>
<!-- hexo injector head_end start --><link rel="stylesheet" href="https://unpkg.com/hexo-next-tags-plus@latest/lib/tag_plus.css" media="defer" onload="this.media='all'"><!-- hexo injector head_end end --></head>

<body itemscope itemtype="http://schema.org/WebPage" class="use-motion">
  <div class="headband"></div>

  <main class="main">
    <div class="column">
      <header class="header" itemscope itemtype="http://schema.org/WPHeader"><div class="site-brand-container">
  <div class="site-nav-toggle">
    <div class="toggle" aria-label="切换导航栏" role="button">
        <span class="toggle-line"></span>
        <span class="toggle-line"></span>
        <span class="toggle-line"></span>
    </div>
  </div>

  <div class="site-meta">

    <a href="/" class="brand" rel="start">
      <i class="logo-line"></i>
      <p class="site-title">苏木</p>
      <i class="logo-line"></i>
    </a>
      <p class="site-subtitle" itemprop="description">我的学习之路</p>
  </div>

  <div class="site-nav-right">
    <div class="toggle popup-trigger" aria-label="搜索" role="button">
        <i class="fa fa-search fa-fw fa-lg"></i>
    </div>
  </div>
</div>



<nav class="site-nav">
  <ul class="main-menu menu"><li class="menu-item menu-item-home"><a href="/" rel="section"><i class="fa fa-home fa-fw"></i>苏木的家</a></li><li class="menu-item menu-item-categories"><a href="/categories/" rel="section"><i class="fa fa-th fa-fw"></i>分类页<span class="badge">42</span></a></li><li class="menu-item menu-item-archives"><a href="/archives/" rel="section"><i class="fa fa-archive fa-fw"></i>归档页<span class="badge">673</span></a></li><li class="menu-item menu-item-flink"><a href="/flink/" rel="section"><i class="fa fa-link fa-fw"></i>友人帐</a></li><li class="menu-item menu-item-about"><a href="/about/" rel="section"><i class="fa fa-user fa-fw"></i>关于我</a></li>
      <li class="menu-item menu-item-search">
        <a role="button" class="popup-trigger"><i class="fa fa-search fa-fw"></i>搜索
        </a>
      </li>
  </ul>
</nav>



  <div class="search-pop-overlay">
    <div class="popup search-popup"><div class="search-header">
  <span class="search-icon">
    <i class="fa fa-search"></i>
  </span>
  <div class="search-input-container">
    <input autocomplete="off" autocapitalize="off" maxlength="80"
           placeholder="搜索..." spellcheck="false"
           type="search" class="search-input">
  </div>
  <span class="popup-btn-close" role="button">
    <i class="fa fa-times-circle"></i>
  </span>
</div>
<div class="search-result-container no-result">
  <div class="search-result-icon">
    <i class="fa fa-spinner fa-pulse fa-5x"></i>
  </div>
</div>

    </div>
  </div>

</header>
        
  
  <aside class="sidebar">

    <div class="sidebar-inner sidebar-nav-active sidebar-toc-active">
      <ul class="sidebar-nav">
        <li class="sidebar-nav-toc">
          文章目录
        </li>
        <li class="sidebar-nav-overview">
          站点概览
        </li>
      </ul>

      <div class="sidebar-panel-container">
        <!--noindex-->
        <div class="post-toc-wrap sidebar-panel">
            <div class="post-toc animated"><ol class="nav"><li class="nav-item nav-level-1"><a class="nav-link" href="#%E4%B8%80%E3%80%81%E6%9F%A5%E7%9C%8B%E6%9C%AA%E6%9A%82%E5%AD%98%E7%9A%84%E5%B7%AE%E5%BC%82"><span class="nav-text">一、查看未暂存的差异</span></a><ol class="nav-child"><li class="nav-item nav-level-2"><a class="nav-link" href="#1-%E5%91%BD%E4%BB%A4%E8%AF%B4%E6%98%8E"><span class="nav-text">1. 命令说明</span></a></li><li class="nav-item nav-level-2"><a class="nav-link" href="#2-%E4%BD%BF%E7%94%A8%E5%AE%9E%E4%BE%8B"><span class="nav-text">2. 使用实例</span></a></li></ol></li><li class="nav-item nav-level-1"><a class="nav-link" href="#%E4%BA%8C%E3%80%81%E6%9F%A5%E7%9C%8B%E5%B7%B2%E6%9A%82%E5%AD%98%E7%9A%84%E5%B7%AE%E5%BC%82"><span class="nav-text">二、查看已暂存的差异</span></a><ol class="nav-child"><li class="nav-item nav-level-2"><a class="nav-link" href="#1-%E5%91%BD%E4%BB%A4%E8%AF%B4%E6%98%8E-1"><span class="nav-text">1. 命令说明</span></a></li><li class="nav-item nav-level-2"><a class="nav-link" href="#2-%E4%BD%BF%E7%94%A8%E5%AE%9E%E4%BE%8B-1"><span class="nav-text">2. 使用实例</span></a></li></ol></li><li class="nav-item nav-level-1"><a class="nav-link" href="#%E4%B8%89%E3%80%81%E6%9F%A5%E7%9C%8B%E6%9A%82%E5%AD%98%E5%90%8E%E5%86%8D%E7%BC%96%E8%BE%91%E7%9A%84%E5%B7%AE%E5%BC%82"><span class="nav-text">三、查看暂存后再编辑的差异</span></a><ol class="nav-child"><li class="nav-item nav-level-2"><a class="nav-link" href="#1-%E5%91%BD%E4%BB%A4%E8%AF%B4%E6%98%8E-2"><span class="nav-text">1. 命令说明</span></a></li><li class="nav-item nav-level-2"><a class="nav-link" href="#2-%E4%BD%BF%E7%94%A8%E5%AE%9E%E4%BE%8B-2"><span class="nav-text">2. 使用实例</span></a></li></ol></li><li class="nav-item nav-level-1"><a class="nav-link" href="#%E5%9B%9B%E3%80%81%E6%9F%A5%E7%9C%8B%E4%BB%BB%E6%84%8F%E4%B8%A4%E6%AC%A1%E6%8F%90%E4%BA%A4%E5%B7%AE%E5%BC%82"><span class="nav-text">四、查看任意两次提交差异</span></a><ol class="nav-child"><li class="nav-item nav-level-2"><a class="nav-link" href="#1-%E5%91%BD%E4%BB%A4%E8%AF%B4%E6%98%8E-3"><span class="nav-text">1. 命令说明</span></a></li><li class="nav-item nav-level-2"><a class="nav-link" href="#2-%E4%BD%BF%E7%94%A8%E5%AE%9E%E4%BE%8B-3"><span class="nav-text">2. 使用实例</span></a></li></ol></li><li class="nav-item nav-level-1"><a class="nav-link" href="#%E4%BA%94%E3%80%81%E4%BD%BF%E7%94%A8BeyondCompare%E4%BD%9C%E4%B8%BAdiff%E5%B7%A5%E5%85%B7"><span class="nav-text">五、使用BeyondCompare作为diff工具</span></a><ol class="nav-child"><li class="nav-item nav-level-2"><a class="nav-link" href="#1-%E9%85%8D%E7%BD%AEdiff%E5%B7%A5%E5%85%B7"><span class="nav-text">1. 配置diff工具</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#1-1-%E5%91%BD%E4%BB%A4%E8%A1%8C%E9%85%8D%E7%BD%AE"><span class="nav-text">1.1 命令行配置</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#1-2-%E4%BF%AE%E6%94%B9-gitconfig%E6%96%87%E4%BB%B6"><span class="nav-text">1.2 修改.gitconfig文件</span></a></li></ol></li><li class="nav-item nav-level-2"><a class="nav-link" href="#2-%E8%B0%83%E7%94%A8%E5%B7%A5%E5%85%B7"><span class="nav-text">2. 调用工具</span></a></li><li class="nav-item nav-level-2"><a class="nav-link" href="#3-%E6%96%87%E4%BB%B6%E5%87%86%E5%A4%87"><span class="nav-text">3. 文件准备</span></a></li><li class="nav-item nav-level-2"><a class="nav-link" href="#4-%E8%B0%83%E7%94%A8difftool"><span class="nav-text">4. 调用difftool</span></a></li><li class="nav-item nav-level-2"><a class="nav-link" href="#5-%E5%85%B3%E9%97%AD%E8%AF%A2%E9%97%AE"><span class="nav-text">5. 关闭询问</span></a></li><li class="nav-item nav-level-2"><a class="nav-link" href="#6-%E4%B8%80%E6%AC%A1%E6%89%93%E5%BC%80%E6%89%80%E6%9C%89%E6%9C%89%E5%B7%AE%E5%BC%82%E7%9A%84%E6%96%87%E4%BB%B6%EF%BC%9F"><span class="nav-text">6. 一次打开所有有差异的文件？</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#6-1-%E6%96%B9%E6%A1%88%E4%B8%80"><span class="nav-text">6.1 方案一</span></a><ol class="nav-child"><li class="nav-item nav-level-4"><a class="nav-link" href="#6-1-1-%E5%88%9B%E5%BB%BAgit-diffall%E6%96%87%E4%BB%B6"><span class="nav-text">6.1.1 创建git-diffall文件</span></a></li><li class="nav-item nav-level-4"><a class="nav-link" href="#6-1-2-%E5%B0%86%E6%96%87%E4%BB%B6%E6%94%BE%E5%85%A5git%E7%9B%AE%E5%BD%95"><span class="nav-text">6.1.2 将文件放入git目录</span></a></li><li class="nav-item nav-level-4"><a class="nav-link" href="#6-1-3-%E4%BD%BF%E7%94%A8%E5%AE%9E%E4%BE%8B"><span class="nav-text">6.1.3 使用实例</span></a></li></ol></li><li class="nav-item nav-level-3"><a class="nav-link" href="#6-2-%E6%96%B9%E6%A1%88%E4%BA%8C"><span class="nav-text">6.2 方案二 </span></a></li></ol></li></ol></li></ol></div>
        </div>
        <!--/noindex-->

        <div class="site-overview-wrap sidebar-panel">
          <div class="site-author animated" itemprop="author" itemscope itemtype="http://schema.org/Person">
    <img class="site-author-image" itemprop="image" alt="苏木"
      src="/images/avatar.jpg">
  <p class="site-author-name" itemprop="name">苏木</p>
  <div class="site-description" itemprop="description">莫道桑榆晚，为霞尚满天</div>
</div>
<div class="site-state-wrap animated">
  <nav class="site-state">
      <div class="site-state-item site-state-posts">
        <a href="/archives/">
          <span class="site-state-item-count">673</span>
          <span class="site-state-item-name">日志</span>
        </a>
      </div>
      <div class="site-state-item site-state-categories">
          <a href="/categories/">
        <span class="site-state-item-count">42</span>
        <span class="site-state-item-name">分类</span></a>
      </div>
      <div class="site-state-item site-state-tags">
        <span class="site-state-item-count">43</span>
        <span class="site-state-item-name">标签</span>
      </div>
  </nav>
</div>
  <div class="links-of-author animated">
      <span class="links-of-author-item">
        <a href="https://github.com/sumumm" title="GitHub → https:&#x2F;&#x2F;github.com&#x2F;sumumm" rel="noopener me" target="_blank"><i class="fab fa-github fa-fw"></i>GitHub</a>
      </span>
  </div>

        </div>
      </div>
    </div>

    
  </aside>


    </div>

    <div class="main-inner post posts-expand">


  


<div class="post-block">
  
  

  <article itemscope itemtype="http://schema.org/Article" class="post-content" lang="zh-CN">
    <link itemprop="mainEntityOfPage" href="https://sumumm.github.io/post/bc162ef0.html">

    <span hidden itemprop="author" itemscope itemtype="http://schema.org/Person">
      <meta itemprop="image" content="/images/avatar.jpg">
      <meta itemprop="name" content="苏木">
    </span>

    <span hidden itemprop="publisher" itemscope itemtype="http://schema.org/Organization">
      <meta itemprop="name" content="苏木">
      <meta itemprop="description" content="莫道桑榆晚，为霞尚满天">
    </span>

    <span hidden itemprop="post" itemscope itemtype="http://schema.org/CreativeWork">
      <meta itemprop="name" content="LV01-Git-04-Git本地仓库-08-查看差异 | 苏木">
      <meta itemprop="description" content="">
    </span>
      <header class="post-header">
        <h1 class="post-title" itemprop="name headline">
          LV01-Git-04-Git本地仓库-08-查看差异
        </h1>

        <div class="post-meta-container">
          <div class="post-meta">
    <span class="post-meta-item">
      <span class="post-meta-item-icon">
        <i class="far fa-calendar"></i>
      </span>
      <span class="post-meta-item-text">发表于</span>

      <time title="创建时间：2023-07-02 15:14:28" itemprop="dateCreated datePublished" datetime="2023-07-02T15:14:28+08:00">2023-07-02</time>
    </span>
    <span class="post-meta-item">
      <span class="post-meta-item-icon">
        <i class="far fa-folder"></i>
      </span>
      <span class="post-meta-item-text">分类于</span>
        <span itemprop="about" itemscope itemtype="http://schema.org/Thing">
          <a href="/categories/%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/" itemprop="url" rel="index"><span itemprop="name">开发工具</span></a>
        </span>
          ，
        <span itemprop="about" itemscope itemtype="http://schema.org/Thing">
          <a href="/categories/%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/" itemprop="url" rel="index"><span itemprop="name">03版本控制</span></a>
        </span>
    </span>

  
    <span class="post-meta-break"></span>
    <span class="post-meta-item" title="本文字数">
      <span class="post-meta-item-icon">
        <i class="far fa-file-word"></i>
      </span>
      <span class="post-meta-item-text">本文字数：</span>
      <span>4k</span>
    </span>
    <span class="post-meta-item" title="阅读时长">
      <span class="post-meta-item-icon">
        <i class="far fa-clock"></i>
      </span>
      <span class="post-meta-item-text">阅读时长 &asymp;</span>
      <span>15 分钟</span>
    </span>
</div>

        </div>
      </header>

    
    
    
    <div class="post-body" itemprop="articleBody"><p>本文主要是Git中分支的管理的相关笔记，若笔记中有错误或者不合适的地方，欢迎批评指正😃。</p>
<span id="more"></span>

<!-- Photo: https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/ -->

<details class="folding-tag" blue><summary> 点击查看使用工具及版本 </summary>
              <div class='content'>
              <table>    <tr>        <td align="center" width=150px>Windows</td>        <td align="left">windows11</td>    </tr>    <tr>        <td align="center">Ubuntu</td>        <td align="left">Ubuntu16.04的64位版本</td>      </tr>    <tr>        <td align="center">VMware® Workstation 16 Pro</td>        <td align="left">16.2.3 build-19376536</td>      </tr></table>
              </div>
            </details>

<details class="folding-tag" blue><summary> 点击查看本文参考资料 </summary>
              <div class='content'>
              <table>    <tr><td align="center">参考方向  </td><td align="center">参考原文</td></tr>    <tr><td align="left">Git 官网</td><td align="left"><a href="https://git-scm.com/" target="_blank">https://git-scm.com/ <i class="fa fa-external-link-alt"></i> </a></td></tr>    <tr><td align="left">Git 官方文档</td><td align="left"><a href="https://git-scm.com/doc" target="_blank">https://git-scm.com/doc <i class="fa fa-external-link-alt"></i> </a></td></tr>    <tr><td align="left">Pro Git Book</td><td align="left"><a href="https://git-scm.com/book/zh/v2" target="_blank">https://git-scm.com/book/zh/v2 <i class="fa fa-external-link-alt"></i> </a></td></tr>    <tr><td align="left">Git 快速使用指南</td><td align="left"><a href="https://training.github.com/downloads/zh_CN/github-git-cheat-sheet/" target="_blank">https://training.github.com/downloads/zh_CN/github-git-cheat-sheet/ <i class="fa fa-external-link-alt"></i> </a></td></tr>    <tr><td align="left">Visual Git Cheat Sheet</td><td align="left"><a href="https://ndpsoftware.com/git-cheatsheet.html#loc=index" target="_blank">https://ndpsoftware.com/git-cheatsheet.html#loc=index <i class="fa fa-external-link-alt"></i> </a></td></tr></table>
              </div>
            </details>

<details class="folding-tag" blue><summary> 点击查看相关文件下载 </summary>
              <div class='content'>
              <table>    <tr>        <td align="center">---</td>        <td align="left">--- <a href="" target="_blank">  <i class="fa fa-external-link-alt"></i></a></td>      </tr></table>
              </div>
            </details>

<p>【说明】本节笔记的相关操作在Windows下进行，因为VS Code有个Git的插件，可以很直观的演示一些东西。由于Git安装后自带一个Git-Bash终端，所以就不用Win下的命令行啦，就用的这个终端，因为它里边的命令与Linux很类似，而windows中的命令行有些命令与linux并不相同，为了统一，还是用用Git自带的终端啦。另外VS Code是可以选择使用的终端的，我直接将VS Code使用的终端改成了git-bash，这样更方便一些。</p>
<p>前边我们可以通过 <code>git status</code> 命令的输出文件的状态，但是我们想知道具体修改了什么地方怎么办？我们可以用 <code>git diff</code> 命令。 接下来就来了解一下 <code>git diff</code>吧，通常可能会用它来回答这几个问题：当前做的哪些更新尚未暂存？ 有哪些更新已暂存并准备好下次提交？两次提交之间有什么差异？我们可以</p>
<h1 id="一、查看未暂存的差异"><a href="#一、查看未暂存的差异" class="headerlink" title="一、查看未暂存的差异"></a><font size=3>一、查看未暂存的差异</font></h1><h2 id="1-命令说明"><a href="#1-命令说明" class="headerlink" title="1. 命令说明"></a><font size=3>1. 命令说明</font></h2><figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git diff &lt;file_name&gt;</span><br></pre></td></tr></table></figure>

<p>此命令比较的是工作目录中当前文件和暂存区域快照之间的差异。 也就是修改之后还没有暂存起来的变化内容。file_name表示我们单独查看某一文件的差异，可以包含路径。不加file_name的话表示查看所有更改的文件差异。</p>
<h2 id="2-使用实例"><a href="#2-使用实例" class="headerlink" title="2. 使用实例"></a><font size=3>2. 使用实例</font></h2><p><code>git diff</code> 能通过文件补丁的格式更加具体地显示哪些行发生了改变。我们还是用上一节的仓库做测试。我们修改main.c文件：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623135309340.png" alt="image-20230623135309340" style="zoom: 50%;" />

<p>这个时候我们只是修改了文件，还未使用<code>git add</code>添加到暂存区，这个时候我们想要知道做了哪些修改，我们可以直接执行下边的命令：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git diff</span><br></pre></td></tr></table></figure>

<p>然后我们可以在终端看到以下信息：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623135354357.png" alt="image-20230623135354357" style="zoom:67%;" />

<p>可以看到我们新添加的内容前边会有一个 + 号，删除的内容会有一个 - 号，添加的内容后边有个 ^M 是啥意思？那个应该是换行，因为git识别的换行可能跟编辑器敲进去的换行不太一样，就导致了乱码，我记得好像是Git使用的linux下的换行LF，而刚才的文件在Windows中编辑的，换行为CRLF，所以就乱码了，这个问题不大，后边注意就是了。</p>
<h1 id="二、查看已暂存的差异"><a href="#二、查看已暂存的差异" class="headerlink" title="二、查看已暂存的差异"></a><font size=3>二、查看已暂存的差异</font></h1><h2 id="1-命令说明-1"><a href="#1-命令说明-1" class="headerlink" title="1. 命令说明"></a><font size=3>1. 命令说明</font></h2><figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git diff --staged &lt;file_name&gt;</span><br></pre></td></tr></table></figure>

<p>若要查看<strong>已暂存的将要添加到下次提交里的内容</strong>，可以用 <code>git diff --staged</code> 命令。 这条命令将比对已暂存文件与最后一次提交的文件差异。file_name表示我们单独查看某一文件的差异，可以包含路径。不加file_name的话表示查看所有更改的文件差异。</p>
<h2 id="2-使用实例-1"><a href="#2-使用实例-1" class="headerlink" title="2. 使用实例"></a><font size=3>2. 使用实例</font></h2><p>我们来试一下将刚才的更改提交到暂存区，然后再执行<code>git diff</code>看一下：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br></pre></td><td class="code"><pre><span class="line">git add .</span><br><span class="line">git diff</span><br></pre></td></tr></table></figure>

<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623135957218.png" alt="image-20230623135957218" style="zoom:67%;" />

<p>发现，好像什么也没输出，那怎么办呢？我们可以加上<code>--staged</code>参数：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git diff --staged</span><br></pre></td></tr></table></figure>

<p>然后我们就能看到差异之处啦：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623140104863.png" alt="image-20230623140104863" style="zoom:67%;" />

<p>当我们修改完文件，通过<code>git add</code>将修改添加到暂存区后，在<code>git commit</code>之前的时候想要查看即将<code>commit</code>的与最后一次提交的文件的差异的话，就可以用这个命令啦。</p>
<h1 id="三、查看暂存后再编辑的差异"><a href="#三、查看暂存后再编辑的差异" class="headerlink" title="三、查看暂存后再编辑的差异"></a><font size=3>三、查看暂存后再编辑的差异</font></h1><h2 id="1-命令说明-2"><a href="#1-命令说明-2" class="headerlink" title="1. 命令说明"></a><font size=3>1. 命令说明</font></h2><figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git diff --cached &lt;file_name&gt;</span><br></pre></td></tr></table></figure>

<p>额，貌似跟<code>git diff --staged</code>没什么区别，<code>--staged</code> 和 <code>--cached</code> 是同义词。file_name表示我们单独查看某一文件的差异，可以包含路径。不加file_name的话表示查看所有更改的文件差异。</p>
<h2 id="2-使用实例-2"><a href="#2-使用实例-2" class="headerlink" title="2. 使用实例"></a><font size=3>2. 使用实例</font></h2><p>上边我们将main.c修改后，添加到暂存区，但是还未提交到版本库，但是这个时候，我们又修改了main.c文件：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623140729587.png" alt="image-20230623140729587" style="zoom:50%;" />

<p>我们执行一下diff命令：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git diff</span><br></pre></td></tr></table></figure>

<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623140830808.png" alt="image-20230623140830808" style="zoom:67%;" />

<p>会发现，只显示了未提交到咱暂存区的修改，那我们加上<code>--staged</code>参数试一下：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git diff --staged</span><br></pre></td></tr></table></figure>



<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623140940477.png" alt="image-20230623140940477" style="zoom:67%;" />

<p>我们加上<code>--cached</code>运行一下：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git diff --cached</span><br></pre></td></tr></table></figure>

<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623141450391.png" alt="image-20230623141450391" style="zoom:67%;" />

<p>发现其实与<code>git diff --staged</code>一样，还以为有什么不同呢。</p>
<h1 id="四、查看任意两次提交差异"><a href="#四、查看任意两次提交差异" class="headerlink" title="四、查看任意两次提交差异"></a><font size=3>四、查看任意两次提交差异</font></h1><p>我们要是想要查看两次提交记录的差异，怎么办呢？</p>
<h2 id="1-命令说明-3"><a href="#1-命令说明-3" class="headerlink" title="1. 命令说明"></a><font size=3>1. 命令说明</font></h2><p>我们可以执行下边的命令：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git diff commit_hash_1 commit_hash_2 &lt;file_name&gt;</span><br></pre></td></tr></table></figure>

<p>这个命令将会显示commit_hash_2相对于commit_hash_1的更改。不加file_name的话表示查看所有更改的文件差异。</p>
<h2 id="2-使用实例-3"><a href="#2-使用实例-3" class="headerlink" title="2. 使用实例"></a><font size=3>2. 使用实例</font></h2><p>我们先看一下提交记录：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git mylog</span><br></pre></td></tr></table></figure>

<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623142939718.png" alt="image-20230623142939718" style="zoom:67%;" />

<p>我们就以下边两次提交为例：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br></pre></td><td class="code"><pre><span class="line">* [qidaink] 65b2acb : feat:C1功能开发  (2023-06-23 08:56:56) </span><br><span class="line">* [qidaink] 859b8ea : feat:C0功能开发  (2023-06-23 08:56:15) </span><br></pre></td></tr></table></figure>

<p>我们执行下边的命令：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git diff 859b8ea 65b2acb</span><br></pre></td></tr></table></figure>

<p>我们会看到有以下输出信息：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623143202474.png" alt="image-20230623143202474" style="zoom:67%;" />

<p>我们把两次提交反过来：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git diff 65b2acb 859b8ea</span><br></pre></td></tr></table></figure>

<p>我们会看到有以下输出信息：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623143250893.png" alt="image-20230623143250893" style="zoom:67%;" />

<p>对比一下就可以看到有什么区别了。</p>
<h1 id="五、使用BeyondCompare作为diff工具"><a href="#五、使用BeyondCompare作为diff工具" class="headerlink" title="五、使用BeyondCompare作为diff工具"></a><font size=3>五、使用BeyondCompare作为diff工具</font></h1><p>其实我们还可以配置diff工具，让我们在敲<code>git diff</code>的时候调用工具来对比文件的变化。BeyondCompare这个软件就是我们常用的比较工具，但是不是免费的，这里就不写怎么获取啦。</p>
<h2 id="1-配置diff工具"><a href="#1-配置diff工具" class="headerlink" title="1. 配置diff工具"></a><font size=3>1. 配置diff工具</font></h2><h3 id="1-1-命令行配置"><a href="#1-1-命令行配置" class="headerlink" title="1.1 命令行配置"></a><font size=3>1.1 命令行配置</font></h3><p>我们直接在终端执行以下命令：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br></pre></td><td class="code"><pre><span class="line">git config --global diff.tool bc</span><br><span class="line">git config --global difftool.bc.path &quot;C:/LenovoSoft/BeyondCompare/Beyond Compare/BCompare.exe&quot;</span><br></pre></td></tr></table></figure>

<h3 id="1-2-修改-gitconfig文件"><a href="#1-2-修改-gitconfig文件" class="headerlink" title="1.2 修改.gitconfig文件"></a><font size=3>1.2 修改.gitconfig文件</font></h3><p>这里以windows下为例，我么找到<code>&quot;C:\Users\用户名\.gitconfig&quot;</code>文件，在配置文件添加以下内容：</p>
<figure class="highlight txt"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br><span class="line">3</span><br><span class="line">4</span><br></pre></td><td class="code"><pre><span class="line">[diff]</span><br><span class="line">    tool = bc</span><br><span class="line">[difftool &quot;bc&quot;]</span><br><span class="line">    cmd = &quot;\&quot;C:/LenovoSoft/BeyondCompare/Beyond Compare/BCompare.exe\&quot; \&quot;$LOCAL\&quot; \&quot;$REMOTE\&quot;&quot;</span><br></pre></td></tr></table></figure>

<h2 id="2-调用工具"><a href="#2-调用工具" class="headerlink" title="2. 调用工具"></a><font size=3>2. 调用工具</font></h2><p>我们配置了工具之后，后边想查看差异，可以将前边所学习的<code>git diff</code>改成<code>git difftool</code>：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br><span class="line">3</span><br></pre></td><td class="code"><pre><span class="line">git difftool &lt;file_name&gt;</span><br><span class="line">git difftool --staged &lt;file_name&gt;</span><br><span class="line">git difftool commit_hash_1 commit_hash_2 &lt;file_name&gt;</span><br></pre></td></tr></table></figure>

<h2 id="3-文件准备"><a href="#3-文件准备" class="headerlink" title="3. 文件准备"></a><font size=3>3. 文件准备</font></h2><p>为了便于测试，我们将前边测试的内容全部撤销：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br></pre></td><td class="code"><pre><span class="line">git reset HEAD .  # 撤销暂存区所有的暂存修改</span><br><span class="line">git checkout -- . # 撤销工作目录下所有的文件修改</span><br></pre></td></tr></table></figure>

<p>然后我们再创建一个文件提交，一会可以查看有多个文件修改的时候的情况：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br><span class="line">3</span><br></pre></td><td class="code"><pre><span class="line">touch readme.md</span><br><span class="line">git add .</span><br><span class="line">git commit -m &quot;feat:添加readme文件&quot;</span><br></pre></td></tr></table></figure>

<p>然后我们修改这两个文件：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623144957270.png" alt="image-20230623144957270" style="zoom:50%;" />

<h2 id="4-调用difftool"><a href="#4-调用difftool" class="headerlink" title="4. 调用difftool"></a><font size=3>4. 调用difftool</font></h2><p>我们执行以下命令：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git difftool</span><br></pre></td></tr></table></figure>

<p>然后终端会弹出以下提示信息：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623145122623.png" alt="image-20230623145122623" style="zoom:67%;" />

<p>我们敲下Y然后按下enter按键即可打开beyondcompare软件进行比较：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623145222670.png" alt="image-20230623145222670" style="zoom:67%;" />

<p>然后我们关闭这个窗口，会发现终端又出现几行：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623145314624.png" alt="image-20230623145314624" style="zoom:67%;" />

<p>由于我们是修改了两个文件，所以这里该查看第二个文件了，我们还是敲个Y就可以了：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623145410360.png" alt="image-20230623145410360" style="zoom:67%;" />

<p>当所有发生改变的文件都显示完了，终端也会退出。</p>
<h2 id="5-关闭询问"><a href="#5-关闭询问" class="headerlink" title="5. 关闭询问"></a><font size=3>5. 关闭询问</font></h2><p>我们发现每个文件都要在终端询问一次，我们都需要输入Y才能查看差异，有什么解决办法吗？当然有啦：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br></pre></td><td class="code"><pre><span class="line">git difftool -y                                 # 临时解决办法</span><br><span class="line">git config --global --add difftool.prompt false # 永久解决</span><br></pre></td></tr></table></figure>

<p>然后有多个文件更改的时候，还是会串行的一个一个打开（上一个关闭后才能打开下一个），但是不需要我们输入Y来确认是否需要打开了。</p>
<h2 id="6-一次打开所有有差异的文件？"><a href="#6-一次打开所有有差异的文件？" class="headerlink" title="6. 一次打开所有有差异的文件？"></a><font size=3>6. 一次打开所有有差异的文件？</font></h2><h3 id="6-1-方案一"><a href="#6-1-方案一" class="headerlink" title="6.1 方案一"></a><font size=3>6.1 方案一</font></h3><h4 id="6-1-1-创建git-diffall文件"><a href="#6-1-1-创建git-diffall文件" class="headerlink" title="6.1.1 创建git-diffall文件"></a><font size=3>6.1.1 创建git-diffall文件</font></h4><p>我们创建一个名为<code>git-diffall</code>的文件，没有扩展名，并输入以下内容：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br><span class="line">3</span><br><span class="line">4</span><br></pre></td><td class="code"><pre><span class="line"><span class="meta prompt_">#</span><span class="language-bash">!/bin/sh</span></span><br><span class="line">git diff --name-only &quot;$@&quot; | while read filename; do</span><br><span class="line">    git difftool &quot;$@&quot; --no-prompt &quot;$filename&quot; &amp;</span><br><span class="line">done</span><br></pre></td></tr></table></figure>

<h4 id="6-1-2-将文件放入git目录"><a href="#6-1-2-将文件放入git目录" class="headerlink" title="6.1.2 将文件放入git目录"></a><font size=3>6.1.2 将文件放入git目录</font></h4><p>然后将文件放在git安装目录的cmd文件夹中，例如<code>C:\Program Files\Git\cmd</code></p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623151447940.png" alt="image-20230623151447940" style="zoom:50%;" />

<h4 id="6-1-3-使用实例"><a href="#6-1-3-使用实例" class="headerlink" title="6.1.3 使用实例"></a><font size=3>6.1.3 使用实例</font></h4><p>这样相当于我们执行的是脚本，我们要更换一下命令：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br><span class="line">3</span><br></pre></td><td class="code"><pre><span class="line">git diffall</span><br><span class="line">git diffall --staged</span><br><span class="line">git diffall commit_hash_1 commit_hash_2</span><br></pre></td></tr></table></figure>

<h3 id="6-2-方案二"><a href="#6-2-方案二" class="headerlink" title="6.2 方案二 "></a><font size=3>6.2 方案二 </font></h3><p>方案二我感觉更合适一些，那就是直接比较则合格那个文件夹，加上<code>--dir-diff</code>参数</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br><span class="line">3</span><br></pre></td><td class="code"><pre><span class="line">git difftool --dir-diff</span><br><span class="line">git difftool --staged --dir-diff</span><br><span class="line">git difftool commit_hash_1 commit_hash_2 --dir-diff</span><br></pre></td></tr></table></figure>

<p>我们来比较两次提交的差异：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br><span class="line">3</span><br></pre></td><td class="code"><pre><span class="line"><span class="meta prompt_">$ </span><span class="language-bash">git mylog</span> </span><br><span class="line">* [qidaink] c77f6a7 : feat:git difftool测试  (HEAD -&gt; master) (2023-06-23 15:01:16) </span><br><span class="line">* [qidaink] 95f3a07 : feat:添加readme文件  (origin/master) (2023-06-23 14:47:53)</span><br></pre></td></tr></table></figure>

<p>我们执行以下命令：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git difftool 95f3a07 c77f6a7 --dir-diff</span><br></pre></td></tr></table></figure>

<p>然后打开是这样的：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-08-%E6%9F%A5%E7%9C%8B%E5%B7%AE%E5%BC%82/img/image-20230623152110159.png" alt="image-20230623152110159" style="zoom:50%;" />

<p>不过这样有一点不好，就是要自己记得左右是哪一次提交，beyondcompare上边没有什么说明的地方。</p>

    </div>

    
    
    

    <footer class="post-footer">




    <div>
        
            <div style="text-align:center;color: #ccc;font-size:14px;">
            ----------本文结束
            <i class="fas fa-fan fa-spin" style="color: #FF1493; font-size: 1rem"></i>
            感谢您的阅读----------
            </div>
        
    </div>





  
  <div class="my_post_copyright"> 
    <p><span>文章标题:</span><a href="/post/bc162ef0.html">LV01-Git-04-Git本地仓库-08-查看差异</a></p>
    <p><span>文章作者:</span><a href="/" title="欢迎访问 《苏木》 的学习笔记">苏木</a></p>
    <p><span>发布时间:</span>2023年07月02日 - 15:14</p>
    <p><span>最后更新:</span>2025年06月14日 - 00:25</p>
    <p><span>原始链接:</span><a href="/post/bc162ef0.html" title="LV01-Git-04-Git本地仓库-08-查看差异">https://sumumm.github.io/post/bc162ef0.html</a></p>
    <p><span>许可协议:</span><i class="fab fa-creative-commons"></i> <a rel="license" href= "https://creativecommons.org/licenses/by-nc-nd/4.0/" target="_blank" title="Attribution-NonCommercial-NoDerivatives 4.0 International (CC BY-NC-ND 4.0)">署名-非商业性使用-禁止演绎 4.0 国际</a> 转载请保留原文链接及作者。</p>  
  </div>
  


          <div class="post-tags">
              <a href="/tags/Git/" rel="tag"><i class="fa fa-tag"></i> Git</a>
          </div>

        

          <div class="post-nav">
            <div class="post-nav-item">
                <a href="/post/6805396b.html" rel="prev" title="LV01-Git-04-Git本地仓库-09-rebase">
                  <i class="fa fa-angle-left"></i> LV01-Git-04-Git本地仓库-09-rebase
                </a>
            </div>
            <div class="post-nav-item">
                <a href="/post/4540c63.html" rel="next" title="LV01-Git-04-Git本地仓库-07-分支管理">
                  LV01-Git-04-Git本地仓库-07-分支管理 <i class="fa fa-angle-right"></i>
                </a>
            </div>
          </div>
    </footer>
  </article>
</div>






</div>
  </main>

  <footer class="footer">
    <div class="footer-inner">

  <div class="copyright">
    &copy; 2017 – 
    <span itemprop="copyrightYear">2025</span>
    <span class="with-love">
      <i class="fa fa-heart"></i>
    </span>
    <span class="author" itemprop="copyrightHolder">苏木</span>
  </div>
<div class="wordcount">
  <span class="post-meta-item">
    <span class="post-meta-item-icon">
      <i class="fa fa-chart-line"></i>
    </span>
      <span>站点总字数：</span>
    <span title="站点总字数">3.7m</span>
  </span>
  <span class="post-meta-item">
    <span class="post-meta-item-icon">
      <i class="fa fa-coffee"></i>
    </span>
      <span>站点阅读时长 &asymp;</span>
    <span title="站点阅读时长">225:26</span>
  </span>
</div>




    <span id="sitetime"></span>
    <script defer language=javascript>
        function siteTime()
        {
            window.setTimeout("siteTime()", 1000);
            var seconds = 1000;
            var minutes = seconds * 60;
            var hours = minutes * 60;
            var days = hours * 24;
            var years = days * 365;
            var today = new Date();
            var todayYear = today.getFullYear();
            var todayMonth = today.getMonth()+1;
            var todayDate = today.getDate();
            var todayHour = today.getHours();
            var todayMinute = today.getMinutes();
            var todaySecond = today.getSeconds();
            /*==================================================
            Date.UTC() -- 返回date对象距世界标准时间(UTC)1970年1月1日午夜之间的毫秒数(时间戳)
            year        - 作为date对象的年份，为4位年份值
            month       - 0-11之间的整数，做为date对象的月份
            day         - 1-31之间的整数，做为date对象的天数
            hours       - 0(午夜24点)-23之间的整数，做为date对象的小时数
            minutes     - 0-59之间的整数，做为date对象的分钟数
            seconds     - 0-59之间的整数，做为date对象的秒数
            microseconds - 0-999之间的整数，做为date对象的毫秒数
            ==================================================*/
            var t1 = Date.UTC(2017, 
                              5, 
                              19, 
                              0, 
                              0, 
                              0); //北京时间
            var t2 = Date.UTC(todayYear,todayMonth,todayDate,todayHour,todayMinute,todaySecond);
            var diff = t2-t1;
            var diffYears = Math.floor(diff/years);
            var diffDays = Math.floor((diff/days)-diffYears*365);
            var diffHours = Math.floor((diff-(diffYears*365+diffDays)*days)/hours);
            var diffMinutes = Math.floor((diff-(diffYears*365+diffDays)*days-diffHours*hours)/minutes);
            var diffSeconds = Math.floor((diff-(diffYears*365+diffDays)*days-diffHours*hours-diffMinutes*minutes)/seconds);
            document.getElementById("sitetime").innerHTML="已在这里 "+diffYears+" 年 "+diffDays+" 天 "+diffHours+" 小时 "+diffMinutes+" 分钟 "+diffSeconds+" 秒";
        }
        siteTime();
    </script>



    </div>
  </footer>

  
  <div class="back-to-top" role="button" aria-label="返回顶部">
    <i class="fa fa-arrow-up fa-lg"></i>
    <span>0%</span>
  </div>
  <div class="reading-progress-bar"></div>

<noscript>
  <div class="noscript-warning">Theme NexT works best with JavaScript enabled</div>
</noscript>


  
  <script src="https://cdnjs.cloudflare.com/ajax/libs/animejs/3.2.1/anime.min.js" integrity="sha256-XL2inqUJaslATFnHdJOi9GfQ60on8Wx1C2H8DYiN1xY=" crossorigin="anonymous"></script>
  <script src="https://cdnjs.cloudflare.com/ajax/libs/next-theme-pjax/0.6.0/pjax.min.js" integrity="sha256-vxLn1tSKWD4dqbMRyv940UYw4sXgMtYcK6reefzZrao=" crossorigin="anonymous"></script>
  <script src="https://cdnjs.cloudflare.com/ajax/libs/fancyapps-ui/5.0.28/fancybox/fancybox.umd.js" integrity="sha256-ytMJGN3toR+a84u7g7NuHm91VIR06Q41kMWDr2pq7Zo=" crossorigin="anonymous"></script>
  <script src="https://cdnjs.cloudflare.com/ajax/libs/lozad.js/1.16.0/lozad.min.js" integrity="sha256-mOFREFhqmHeQbXpK2lp4nA3qooVgACfh88fpJftLBbc=" crossorigin="anonymous"></script>
<script src="/js/comments.js"></script><script src="/js/utils.js"></script><script src="/js/motion.js"></script><script src="/js/next-boot.js"></script><script src="/js/pjax.js"></script>

  <script src="https://cdnjs.cloudflare.com/ajax/libs/hexo-generator-searchdb/1.4.1/search.js" integrity="sha256-1kfA5uHPf65M5cphT2dvymhkuyHPQp5A53EGZOnOLmc=" crossorigin="anonymous"></script>
<script src="/js/third-party/search/local-search.js"></script>




  <script src="/js/third-party/fancybox.js"></script>

  <script src="/js/third-party/pace.js"></script>


  




  

  <script class="next-config" data-name="enableMath" type="application/json">false</script><script class="next-config" data-name="mathjax" type="application/json">{"enable":true,"tags":"none","js":{"url":"https://cdnjs.cloudflare.com/ajax/libs/mathjax/3.2.2/es5/tex-mml-chtml.js","integrity":"sha256-MASABpB4tYktI2Oitl4t+78w/lyA+D7b/s9GEP0JOGI="}}</script>
<script src="/js/third-party/math/mathjax.js"></script>


 
        <div id="click-show-text"
            data-mobile = false
            data-text = 富强,民主,文明,和谐,自由,平等,公正,法制,爱国,敬业,诚信,友善
            data-fontsize = 15px
            data-random= false>
        </div>
       

      
        <script async src=https://cdn.jsdelivr.net/npm/hexo-next-mouse-effect@latest/click/showText.js></script>
      

      
    




    <script async src="/js/fancybox_param.js"></script>





<!-- APlayer本体 -->



</body>
</html>
